Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

r/aws_fms_policy: Suppress diffs on null and [] JSON fields #32860

Merged
merged 21 commits into from
Aug 4, 2023
Merged

r/aws_fms_policy: Suppress diffs on null and [] JSON fields #32860

merged 21 commits into from
Aug 4, 2023

Conversation

ewbankkit
Copy link
Contributor

Description

Suppresses diffs in security_service_policy_data.managed_service_data JSON data caused by null and empty array ([]) JSON fields.

Relations

Closes #21894.
Closes #23953.

References

Output from Acceptance Testing

% AWS_DEFAULT_REGION=us-east-1 make testacc TESTARGS='-run=TestAccFMS_serial/AdminAccount' PKG=fms
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/fms/... -v -count 1 -parallel 20  -run=TestAccFMS_serial/AdminAccount -timeout 180m
=== RUN   TestAccFMS_serial
=== PAUSE TestAccFMS_serial
=== CONT  TestAccFMS_serial
=== RUN   TestAccFMS_serial/AdminAccount
=== RUN   TestAccFMS_serial/AdminAccount/basic
=== RUN   TestAccFMS_serial/AdminAccount/disappears
--- PASS: TestAccFMS_serial (3498.01s)
    --- PASS: TestAccFMS_serial/AdminAccount (3498.01s)
        --- PASS: TestAccFMS_serial/AdminAccount/basic (1228.27s)
        --- PASS: TestAccFMS_serial/AdminAccount/disappears (2269.74s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/fms	3503.001s
testing: warning: no tests to run
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/fms/ujson	0.134s [no tests to run]
% AWS_DEFAULT_REGION=us-east-1 make testacc TESTARGS='-run=TestAccFMS_serial/Policy' PKG=fms 
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/fms/... -v -count 1 -parallel 20  -run=TestAccFMS_serial/Policy -timeout 180m
=== RUN   TestAccFMS_serial
=== PAUSE TestAccFMS_serial
=== CONT  TestAccFMS_serial
=== RUN   TestAccFMS_serial/Policy
=== RUN   TestAccFMS_serial/Policy/policyOption
    acctest.go:83: PolicyOption not returned from AWS API
=== RUN   TestAccFMS_serial/Policy/update
=== RUN   TestAccFMS_serial/Policy/alb
=== RUN   TestAccFMS_serial/Policy/disappears
=== RUN   TestAccFMS_serial/Policy/includeMap
=== RUN   TestAccFMS_serial/Policy/resourceTags
=== RUN   TestAccFMS_serial/Policy/securityGroup
=== RUN   TestAccFMS_serial/Policy/tags
=== RUN   TestAccFMS_serial/Policy/basic
=== RUN   TestAccFMS_serial/Policy/cloudfrontDistribution
--- PASS: TestAccFMS_serial (462.80s)
    --- PASS: TestAccFMS_serial/Policy (462.80s)
        --- SKIP: TestAccFMS_serial/Policy/policyOption (0.00s)
        --- PASS: TestAccFMS_serial/Policy/update (32.56s)
        --- PASS: TestAccFMS_serial/Policy/alb (16.91s)
        --- PASS: TestAccFMS_serial/Policy/disappears (19.21s)
        --- PASS: TestAccFMS_serial/Policy/includeMap (22.17s)
        --- PASS: TestAccFMS_serial/Policy/resourceTags (34.09s)
        --- PASS: TestAccFMS_serial/Policy/securityGroup (22.06s)
        --- PASS: TestAccFMS_serial/Policy/tags (33.31s)
        --- PASS: TestAccFMS_serial/Policy/basic (21.70s)
        --- PASS: TestAccFMS_serial/Policy/cloudfrontDistribution (260.79s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/fms	467.567s
testing: warning: no tests to run
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/fms/ujson	0.182s [no tests to run]

@github-actions
Copy link

github-actions bot commented Aug 4, 2023

Community Note

Voting for Prioritization

  • Please vote on this pull request by adding a 👍 reaction to the original post to help the community and maintainers prioritize this pull request.
  • Please see our prioritization guide for information on how we prioritize.
  • Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for issue followers and do not help prioritize the request.

For Submitters

  • Review the contribution guide relating to the type of change you are making to ensure all of the necessary steps have been taken.
  • For new resources and data sources, use skaff to generate scaffolding with comments detailing common expectations.
  • Whether or not the branch has been rebased will not impact prioritization, but doing so is always a welcome surprise.

@github-actions github-actions bot added size/XL Managed by automation to categorize the size of a PR. documentation Introduces or discusses updates to documentation. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/fms Issues and PRs that pertain to the fms service. generators Relates to code generators. prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. labels Aug 4, 2023
@ewbankkit ewbankkit merged commit 3d88c83 into main Aug 4, 2023
41 checks passed
@ewbankkit ewbankkit deleted the b-aws_fms_policy-diffs branch August 4, 2023 15:02
@github-actions github-actions bot added this to the v5.12.0 milestone Aug 4, 2023
github-actions bot pushed a commit that referenced this pull request Aug 4, 2023
Update CHANGELOG.md for #32860
f932184
@github-actions
Copy link

This functionality has been released in v5.12.0 of the Terraform AWS Provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template. Thank you!

@github-actions
Copy link

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 10, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
documentation Introduces or discusses updates to documentation. generators Relates to code generators. prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. service/fms Issues and PRs that pertain to the fms service. size/XL Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Milestone
v5.12.0
1 participant
@ewbankkit